Skip to content

Adding Gen 6 Ambush Encounters#1576

Open
ItsMeJoji wants to merge 6 commits into
PokeAPI:masterfrom
ItsMeJoji:shaking-encounters
Open

Adding Gen 6 Ambush Encounters#1576
ItsMeJoji wants to merge 6 commits into
PokeAPI:masterfrom
ItsMeJoji:shaking-encounters

Conversation

@ItsMeJoji

Copy link
Copy Markdown
Contributor

Change description

This PR consists of the X and Y Ambush encounters that were missing.

This includes additions of new Encounters, Encounter Methods, and Encounter Conditions.

This would close Issue #1454.

AI coding assistance disclosure

No AI was used in adding these.

Contributor check list

  • I have written a description of the contribution and explained its motivation.
  • I have written tests for my code changes (if applicable).
  • I have read and understood the AI Assisted Contribution guidelines.
  • I will own this change in production, and I am prepared to fix any bugs caused by my code change.

@jemarq04 jemarq04 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking through the encounters, there are quite a few off-by-one errors when it comes to the encounter methods (e.g. some ID 56 overworld-dirt that should be ID 57 trash-can). Once you fix these up, I'll take another look. Thanks!

Comment on lines +258 to +266
257,26,berry-tree-red,1
258,26,berry-tree-blue,1
259,26,berry-tree-purple,1
260,26,berry-tree-green,1
261,26,berry-tree-yellow,1
262,26,berry-tree-pink,1
263,27,daily-trash-can,1
264,27,tuesday-trash-can,1
265,27,thursday-trash-can,1 No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally the encounter condition values' identifiers start with the encounter condition identifier. For example, for berry-tree-type we'd use something like berry-tree-type-blue and so on.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I'll adjust them something like trash-can-type-daily.

Comment thread data/v2/csv/encounter_methods.csv Outdated
18,gift,18
19,gift-egg,19
20,only-one,20
20,static-encounter,20

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
20,static-encounter,20
20,static,20

Maybe just 'static', since these are all methods for encountering pokemon.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, sounds good. I'll also change sos-encounter to just say sos to match as well.

@jemarq04 jemarq04 Jun 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I missed that lol. Well, if it wasn't consistent before, we can leave this as-is!
Edit: I worded this wrong, but basically if we have something else with 'encounter' in it then it's up to you

Comment thread data/v2/csv/encounter_methods.csv Outdated
Comment on lines +58 to +62
57,trash-can,57
58,rustling-bush-ambush,58
59,ceiling-ambush,59
60,ground-ambush,60
61,sky-ambush,61 No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great start on the new methods! Looking at Bulbapedia, some of these are even used again in Alola, so this will be helpful there too.

Regarding the names, maybe they should all contain 'ambush'? So something like trash-can-ambush? That way they can be understood as a group at a glance.

@ItsMeJoji

Copy link
Copy Markdown
Contributor Author

Looking through the encounters, there are quite a few off-by-one errors when it comes to the encounter methods (e.g. some ID 56 overworld-dirt that should be ID 57 trash-can). Once you fix these up, I'll take another look. Thanks!

Looks like I didn't take the previous method into account. I shifted everything up correctly. I'll push once I confirm it builds correctly and is set to the right methods.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants